[automerger skipped] DO NOT MERGE: Fix various settings chassification bugs am: 2d23f495ff -s ours am skip reason: subject contains skip directive am: cf9644b0d9 am: dea51c004a am: fb3fc1201e am: 83edf574ac -s ours
am skip reason: subject contains skip directive

Change-Id: Ifd5864b67df5cd951baf97d7c854af2780685b60
tree: 418254f37978850aaa011b5eab2efc4758d840ca
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml
  6. PREUPLOAD.cfg