[automerger skipped] Merge "DO NOT MERGE: CTS test for Android Security b/73552574" into pie-cts-dev am: 7575db7eee -s ours am: c3661612c8 -s ours am: de2e248742
am: e5d7f13bb6

Change-Id: I019e0834f73e060981c62dca7fa2d62dcae3fc44