Merge "[CS05]Remove the hidden API usage of MetricsLogger" am: 4297526f8b am: 7f3280692c am: 8faf9990e6

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2d784ac885ffcbc7a4539cf6e5b4774af5c11c43
tree: c25825395dcc2703c4d6275809272459429d0beb
  1. framework/
  2. service/
  3. OWNERS