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

Merge "Improved telephony registry logging" into tm-dev am: ccfa25d8 am: 19162c1e am: b9efeecd am: 97fb78de

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



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