[automerger skipped] Merge "Ensure SubscriptionPlans can be removed" am: 0bf5d39174 am: 835d1bd085 am: 032593aa03 -s ours
am skip reason: Merged-In I93aece78eda324c333fbf9f1adbedcf46e4864f0 with SHA-1 e6f17feb77 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2032903
Change-Id: I70c8b000f5120f8f7039aa18d2ccee24198c9034
This commit is contained in: