Merge "Metric System Cleanup" into udc-dev am: 325a4e20

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



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