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

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



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