[automerger] CTS test for Android Security b/33862021 am: 81c3be5c42 am: c304f8374b am: 0d5d7f84f8

Change-Id: I417f412d0b2dc4fa642be560f93edc02e8a053e0