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: d6c2f8c4

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



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