Merge "Resolve the hidden SubscriptionManager API usage in  NetworkPolicyManagerService in Mainline"