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

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

Change-Id: I1f1aa9fd77bf770a8b3f04c8dde81a861062a381