Merge "Merge "Cleaning up TODOs in Metric Classes" into udc-dev am: f7a33f14 am: 4361ce5c" into udc-d1-dev-plus-aosp am: dcc7ba4d

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



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