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

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



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