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