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

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



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