Merge "Merge "Fix unreadable debug message in cell identity" into rvc-dev am: 11ce6826 am: 4f4d4093 am: 603d1f90" into rvc-qpr-dev-plus-aosp am: bd9dbac7

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

Change-Id: I0717a037a84e610a3da330b453fb6b8b2352398a