Merge "Metric System Cleanup" into udc-dev am: 325a4e206c am: e640cc681e am: 7817d6fa27
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23181460 Change-Id: If7c3960b1f11e46eba1b2c6ebabe5ed31cae47e7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: