Merge "Fix "can't find system service" error on PackageManager." into udc-dev...

Merge "Fix "can't find system service" error on PackageManager." into udc-dev am: 07f88ddc am: f3636661

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telecomm/+/21567482



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