Merge "CTS test for Android Security b/129561406" into oc-dev am: 8d1cdabf37
am: dad317dd4e

Change-Id: I5096e4a2aad486fcf860946882ba99aefc26fabd