Merge "Notify connectivity service when admin UID changes" into tm-dev am:...

Merge "Notify connectivity service when admin UID changes" into tm-dev am: e0338d25 am: 5dc0bbce

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/17626857



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