[automerger] CTS test for Android Security b/33641588 am: 119dfe13bf am: 99977d2edf

Change-Id: I5441fa8e37b640415844e577e9c904b6bf15bf4f