[automerger skipped] Merge "DO NOT MERGE: CTS test for Android Security b/62673179" into nougat-cts-dev
am: 98269b486d  -s ours

Change-Id: I3dae84b5a18b2301388ed38f3dfc65b60ac70431