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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2d784ac885ffcbc7a4539cf6e5b4774af5c11c43
tree: 785329851bfec68dfda542ff08051a1a90145e3f
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS