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 am: b84f850b

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



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