Merge "Ensure SubscriptionPlans can be removed" am: 0bf5d39174 am: 835d1bd085

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

Change-Id: Id39d1f444443b35977befb9be2450378718f2921