DO NOT MERGE: Fix various settings chassification bugs

Fix: 145997711
Bug: 142513087
Test: Manual

Change-Id: Ieb68af87e89a5d07fe784a6610534153b2d2bc3d
(cherry picked from commit 2d23f495ffbb368c4aec84266c9e5e0b1da030db)
9 files changed
tree: 8768cffc3859a6a54a7afa417ee3163c4275cc7a
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. PREUPLOAD.cfg