Merge "Merge "Update debug printing." into tm-dev am: b83faa12" into...

Merge "Merge "Update debug printing." into tm-dev am: b83faa12" into tm-mainline-prod am: 91231e2f

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

Change-Id: Icb575f3405750f10854bdc79921b8a5aeab0c1af
Signed-off-by: Automerger Merge Worker