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

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

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