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

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

Change-Id: Ifc7f3dc43a4bdea06e82ae18bd03fce0932ad927