Merge "[CS05]Remove the hidden API usage of MetricsLogger" am: 6ef08c36a7 am: c5ed4d8124

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I34df69bec5ee2bab2b8fd4e366f4d3967b471fd5
tree: 1bf0a82b3ad8307f602facee6ea81691d8ae259b
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS