Merge "SubscriptionPlan: remove getNetworkTypesBitMask"