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

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



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