[automerger skipped] Merge "Fixed UID mismatch in telephony registry" am:...

[automerger skipped] Merge "Fixed UID mismatch in telephony registry" am: c2fa03fc am: 73047c69 am: c14da661 -s ours am: 42d7c0fa -s ours

am skip reason: Merged-In I761b9a73f7654eea14d08f7d2602978d32aedffc with SHA-1 7b7cca04 is already in history

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



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