Merge "[automerger skipped] Enforce privileged phone state for...

Merge "[automerger skipped] Enforce privileged phone state for getSubscriptionProperty(GROUP_UUID) am: 12db8db9 am: 8b3f7497 -s ours am: ca15ac21 -s ours am: 397ceb7c -s ours am: d78db048 -s ours am: c4fdff78 -s ours am: 69df9eaf -s ours am: e2afd744 -s ours" into tm-d1-dev-plus-aosp am: 64598ddc -s ours am: eff8ed29 -s ours

am skip reason: Merged-In I8d7cc836402a9a7695c972860d38035c4ec0fa44 with SHA-1 12db8db9 is already in history

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



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