[automerger skipped] Merge "[Regional Preference] Need to remove the metrics...

[automerger skipped] Merge "[Regional Preference] Need to remove the metrics by the metrics concil team's comment." into udc-qpr-dev am: 61167501 am: 6609d39b -s ours

am skip reason: Merged-In I8eecba55288bfad6f81b5c8c1a8290afccdd5ef8 with SHA-1 ae32c8e8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24521607



Change-Id: Ib64765eb63957b1b958137300abf73c9573ba8fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>