Merge "Add read/write logic for SubscriptionPlan network types field" into rvc-d1-dev am: 76b7c3ccb4 am: 0b7a97fc80

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

Change-Id: Id4793cae167d349ee26e7f4e38f2eb0926045d6a