Merge "Merge "STS test for Android Security b/32219453" into oc-dev am: 48376c587c am: 117438c527 am: e958f7ca9a" am: 404ee71139 am: 1850c71c4a
am: a46958d607

Change-Id: I13250fc76a68080ca009676420838815c052c616