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

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



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