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

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

Change-Id: I64d6d49a0d1bb7db7904a56f0b9fa9df1d530d2a