[automerger] CTS test for Android Security b/33933140 am: a105077efd am: ddac62f8a2 am: 58d9fab204 am: 5d96628180 am: b06866f88f am: c699d96ba5 am: 80420843bd am: 60c64c3ca8 am: 9ede4e7d39

Change-Id: Id01a1a9422b2941ddc08b084581ab4a27da28256