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

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

Change-Id: I3373614dc55d6531be0411289787fe501753b1cf