[automerger skipped] Merge "Update carrier privilege check in...

[automerger skipped] Merge "Update carrier privilege check in enforceSubscriptionPlanAccess" am: 958f9efb am: 3c6d7d7d -s ours am: 740a9185 -s ours am: 7f0ece6b -s ours

am skip reason: skip tag Change-Id Icb4e2c619dacaea9e74cedea31865ec1eb689dce with SHA-1 172f15e5 is already in history

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

Change-Id: Id86f3232b9f3a0b1dbbfa014b9cd25f4ec4799db