[automerger] CTS test for Android Security b/33862021 am: 81c3be5c42 am: c304f8374b am: 0d5d7f84f8 am: 2ff97b01a8 am: aa344257fd am: 5e01529f4a am: 20c83cd412

Change-Id: Iabe59bcb5a9186c9010c797d2c46dc285d53f991