[automerger skipped] Merge "Add read/write logic for SubscriptionPlan network types field" am: f4847995bc am: 19519ff57f -s ours am: 049001bac4 -s ours am: 42e6fc36db -s ours

am skip reason: Change-Id Ib821590a573db87b22619cfe7ebe64c0230c5031 with SHA-1 8fce85a6f8 is in history

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

Change-Id: I5cdedfb755bd236f50210ba3daa775afc34af193