[automerger skipped] Merge "Changed ExtraSettingsPreferenceController's way of reading metadata boolean. Fixed flaky unit test." into pi-car-dev am: a3a0a4a874 am: 762e44a892 am: dde4c3568e -s ours
am skip reason: skipped by user jianyliu

Change-Id: I82db0031fd3c5f7eb4f7127d7761f56897795ebe
tree: e6b4471d1f3f422b8e27d162e35a4a6efb2572d8
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml
  6. OWNERS
  7. PREUPLOAD.cfg