[automerger skipped] Merge "Switch settings to use Time[|Zone]Detector" into stage-aosp-master am: e31850f5f5 am: 922ac2bf5d -s ours
am skip reason: Change-Id I9546a4823703c5c35c415e5bbd9bfc352d2a271b with SHA-1 04bf15c4f3 is in history

Change-Id: I34d48f077fd312c62dba12ccea9ff43d377576a7
tree: 8b150d8791f5c391bc25a1771228516a34db6018
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml
  6. PREUPLOAD.cfg