[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

Change-Id: I512973bd2883fd5dce0252ab3a8656fd799bc2f8