Merge changes from topic "regional_preference_metrics" into udc-dev am: 1d749986

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



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