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

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



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