Merge "CTS test for Android Security b/135207252" into oc-mr1-dev am: 180fc9b8ae

Change-Id: I58f5fb77e62eb890ef9cab7dc596f5965ca8f078