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

Change-Id: I1b4fac5521c8a816cf9e9ce9b639031159c2e6c3