Merge "CTS test for Android Security b/73251618 b/77875799" into oc-mr1-dev
am: c6a02b4e40

Change-Id: Iacde5268742c6f7ba9d324b5bad7710cdcb45605