[automerger skipped] [RESTRICT AUTOMERGE] CTS test for Android Security b/24346430 am: 0699eb53f9 am: fae3a1d115 -s ours am: 0d36c49fa4 -s ours am: b475a25b76 -s ours am: 9a4b608c2c -s ours

am skip reason: Change-Id I3977680d38f6c3fe0fb3f45e8fc87cace7da221f with SHA-1 661e808ba0 is in history

Change-Id: Ibe8b73bbe522bf567dd4b25558801aaf4c8537d2