Merge "Whitelist com.android.proxyhandler for power"