Merge "Tag toString fields for easier bugreport parsing" into sc-dev am: 08131018 am: 5c2589aa am: af226326

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

Change-Id: Ic1e0e4eb04e5f0d9febcf11f17fa606e48e444c4