Merge "Merge "Tag toString fields for easier bugreport parsing" into sc-dev...

Merge "Merge "Tag toString fields for easier bugreport parsing" into sc-dev am: 08131018 am: e4070407" into sc-v2-dev-plus-aosp am: 25f3e8f4

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

Change-Id: I08052d0ce4929f1bfbdd81c132b7a9beaa0b501e