Merge "[RESTRICT AUTOMERGE] CTS test for Android Security b/112159345" into oc-dev am: 14033c30a5

Change-Id: I3b482631b23cc7cfc5fa8d2ccd5398cb45af26b1