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

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



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