Merge "WifiManager: Add privileged API for removing app state"