Merge "Improved telephony registry logging" into tm-dev am: ccfa25d8 am:...

Merge "Improved telephony registry logging" into tm-dev am: ccfa25d8 am: 6ca4ec4c am: d9feee6b

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



Change-Id: I723def99d5cd15a734f5a4daab2c8aa00c2092cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>