Merge "Fixed UID mismatch in telephony registry" into udc-dev am: dc479069 am: a559e54b

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



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