[automerger] CTS test for Android Security b/34231163 am: 40e8b6205b am: 6142a48220

Change-Id: Iaffdfd9d2909d470421e96e7c5eb3a2878e8f74c