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

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

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



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