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

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



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