Merge "CTS test for Android Security b/72325759 b/65281159" into oc-dev am: 15b2976e am: b2099604 am: 53b6c105 Change-Id: I0eaec79103c0dbb30eb8d2dd27c2ed3820464a76