Merge "API review: SubscriptionPlan#getNetworkTypes/setNetworkTypes" am: b93bf72090

Change-Id: I2cb457a7fbd76dae846e66d6efde117e7f513a47