Merge "Remove hidden API usage in metrics toString" am: 179419f810

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

Change-Id: Ie5c89993c019770cdf71818565ed86f50fe9fcd1
tree: e07f79dcc7173724fcf61f0bd5479b4b96ff252e
  1. core/
  2. services/
  3. wifi/