[automerger skipped] Merge "Remove SubscriptionPlan.getNetworkTypesBitMask" am: 5931718e am: a926c2ac -s ours
am skip reason: Change-Id Ie7570e948cf552cd449d60dc4e4c5b4553a2a6e9 with SHA-1 a293d8dc is in history
Change-Id: Ic17f898f4a20a5999ac489403f62cd40a833308f