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

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



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