[automerger skipped] Merge "Improved telephony registry logging" am:...

[automerger skipped] Merge "Improved telephony registry logging" am: 8a3803d4 -s ours am: a1791b84 -s ours am: 8f5f467b -s ours

am skip reason: Merged-In Ifd00798a9add597b06677b857c58b3a946fb7435 with SHA-1 287ab771 is already in history

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



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