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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2d784ac885ffcbc7a4539cf6e5b4774af5c11c43