[automerger skipped] Merge "Ensure SubscriptionPlans can be removed" am:...

[automerger skipped] Merge "Ensure SubscriptionPlans can be removed" am: 0bf5d391 am: 835d1bd0 am: 032593aa -s ours am: c31090f0 -s ours am: 0365337c -s ours

am skip reason: Merged-In I93aece78eda324c333fbf9f1adbedcf46e4864f0 with SHA-1 e6f17feb is already in history

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

Change-Id: I931938c2b57d41463804812242dd01ca2a35bb41