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

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



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