Merge "Whitelist com.android.proxyhandler for power"
am: 6527b5bdd0

Change-Id: I28f1e3bef5a9caad7cb7cc933398783d9f969b79