Settings: update a few CM strings

Change-Id: I2030502c51e44076f8ac17256b1485a060598db7
Signed-off-by: Ricky Salinas <rsalinas1@mail.usf.edu>
Merge "Settings: update a few CM strings" into cm-11.0
Merge commit '2b060af7d3eb81e04be6df3bf0a7aaca72b84131' into test