[automerger skipped] Merge "CTS test for Android Security b/68299873" into oc-dev am: cc0b769fd9 am: fc0ba73384 -s ours am: db600d32b8 -s ours am: 0840aa7985 -s ours am: af513074c3 -s ours am: d624805574 -s ours
am skip reason: Change-Id I82f0af12cb273bf5fa78d749ab052fa97ed4f189 with SHA-1 9ff04eba39 is in history

Change-Id: Iba58c2242d30fdc99b08516000c0aefc8a790ffc