Merge "Merge "Use valid metric ids" into udc-dev am: f1cc70e4 am:...

Merge "Merge "Use valid metric ids" into udc-dev am: f1cc70e4 am: 8ab7139c" into udc-d1-dev-plus-aosp am: 3ac153ef

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23589660



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