Merge "Merge "Fix cleartext default for the manifest value" into pi-dev am:...
Merge "Merge "Fix cleartext default for the manifest value" into pi-dev am: 75a31732" into pi-dev-plus-aosp
am: a9573211
Change-Id: Iae321380f76f4176370d3daec4098d85fc29b028