Merge "Enforce FEATURE_TELEPHONY_SUBSCRIPTION in getPackagesWithCarrierPrivileges" into main am: 8f0e2fc3a0 am: 6a3585fe74

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/3281131

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