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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I34df69bec5ee2bab2b8fd4e366f4d3967b471fd5