tree e7db8197218deed40d85e1fe6da206db07ba511d
parent a61b23b89eb64bae9f787e426db4c40d8541e097
parent 958f9efba57fcae71ddbfe9cf70cc0aed1dbaa26
author Sarah Chin <sarahchin@google.com> 1618865028 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1618865028 +0000

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

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

Change-Id: I7bd37f0acb7f939b9fc0311ac0365be3e8587823