Merge "[CS05]Remove the hidden API usage of MetricsLogger" am: 9e79e9d99a

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8de53ff3755ae4f15bdaf1b4f6dbd1850e99ed94