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

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



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