Merge "Merge "Merge "Fixed unreadble debug messages" into rvc-dev am:...

Merge "Merge "Merge "Fixed unreadble debug messages" into rvc-dev am: 9ff26254 am: faac3668" into rvc-d1-dev-plus-aosp am: 75827ee3" into rvc-qpr-dev-plus-aosp am: a2156b49

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

Change-Id: Ida569e4d128675509290b6bcf63898e6b1f17821