[automerger skipped] Merge "Add read/write logic for SubscriptionPlan network...

[automerger skipped] Merge "Add read/write logic for SubscriptionPlan network types field" am: f4847995 am: 19519ff5 -s ours am: 049001ba -s ours

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

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

Change-Id: I85c3a7fdf5ce03cca230202a751a699872c3b48d