Merge "API review: SubscriptionPlan#getNetworkTypes/setNetworkTypes" into rvc-dev am: 210bccd9 am: 4eb9055c Change-Id: Ib53b6a14eb7a9b0ec00269b91464bd11de1638e1