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

Change-Id: I95b43535c0a23da988627997b52e092774a875ab