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

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



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