[automerger skipped] Merge Android U (ab/10368041) am: f064e8f41d -s ours

am skip reason: Merged-In I8111fd6e368c82125662bca06906fbe729241da2 with SHA-1 974430d02c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/localepicker/+/24182680

Change-Id: Ia61cb66ae57ddeca2acf87b8e5884d3730779dcd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: bda43a28dc47b636fd4c231e2362c68ec61725f4
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml