[automerger] CTS test for Android Security b/28816956 am: 29343c18d8 am: ed9bbd28ce am: a52e67d94f

Change-Id: I2cb1a2c83bca110ef880050a19b5339e8dea850b