Merge "Update carrier privilege check in enforceSubscriptionPlanAccess" am: 958f9efba5

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

Change-Id: I7bd37f0acb7f939b9fc0311ac0365be3e8587823