[automerger] CTS test for Android Security b/33387820 am: 1a53f5d062 am: b8d59af8f3 am: 2cd0565685 am: 3618914a23 am: 904d889608 am: 9bd459571a

Change-Id: I390832ae756bf5250037fc382c170a625137b405