Merge "Cleaning up TODOs in Metric Classes" into udc-dev am: f7a33f14

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



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