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

Change-Id: Ie4a8acd92bedb0fe8cc72dfd2bffb0a3af28fa45