Merge "Resolve the hidden SubscriptionManager API usage in  NetworkPolicyManagerService in Mainline"
am: 7826c2f43e

Change-Id: Ifc72d14aac9868f230cc10a57b5326a9de362241