Settings: Add android namespace prefix

Change-Id: Iaeedf6a120ea13d5ddcc62d9081b5b31d13bc05e
Merge remote-tracking branch 'pac/cm-10.2' into HEAD