Merge "Add Low Power Standby support to NetworkPolicyManagerService"