[automerger skipped] Merge "DO NOT MERGE: Fix various settings chassification bugs" into qt-dev am: da8860aae6 am: 7518f9b06d am: 5c1fed0470 am: 41ac091464 -s ours
am skip reason: subject contains skip directive

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