Merge "[Metrics] Remove locale string from Metrics because it should be...

Merge "[Metrics] Remove locale string from Metrics because it should be reviewed" into udc-dev am: f4939a4b

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



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