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