Merge "Starting Unit Tests for Metrics" into udc-dev am: b42ac693 am:...

Merge "Starting Unit Tests for Metrics" into udc-dev am: b42ac693 am: 5e4a7a0e am: a7e879a1 am: ec7e1725

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



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