Merge "Update carrier privilege check in enforceSubscriptionPlanAccess" into rvc-qpr-dev am: 5ccc5d56fb

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13676219

Change-Id: Iaa38b99c82bc54e6e8b7a93e24c800281fc53905