Settings: update Privacy Guard help text string

Fix tiny error plus shorten string a bit

Change-Id: I3453d677a5bce8d8f58539d71283d47fe4a4cbf4
Signed-off-by: Ricky Salinas <rsalinas1@mail.usf.edu>
Settings: EL AOSP translation fixes

Come on AOSP, we're fixing these since ICS...

Change-Id: Ic94f25a2335d187c98d8712e8dbd3bcaac82cfb9
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0