Merge "Resolve the hidden SubscriptionManager API usage in  NetworkPolicyManagerService in Mainline" am: 7826c2f43e am: 448900bbee am: 583cd5a009

Change-Id: Ia2e297b68c679f16ef88e877e89aee33b3414a2f