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