[automerger] CTS test for Android Security b/37203196 am: 6fb1fac773 am: 2abd1d909e

Change-Id: I19a4e5df9c52fbc1b058087173c259dc5d4b677b