[automerger] CTS test for Android Security b/33818500 am: bd6ec9c818 am: 9741538696 am: 7ffd6d9539

Change-Id: Idadb9198089c8edb90a6d8bf1e6debbe7b3e35f6