[automerger skipped] Improved telephony registry logging am: c947aed9 -s...

[automerger skipped] Improved telephony registry logging am: c947aed9 -s ours am: dc8e374e -s ours am: 09887806 -s ours am: 2e2a07bd -s ours am: a2df7a51 -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: If014b0bfc00beaf69d8e28a8f397168929081a6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>