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

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



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