Merge "Enable cleartext for captive portal apps" into pi-dev
am: c88ca67bb3

Change-Id: Ie38d6ce6f54336db2f4672746dc7385e0a7979fb