[automerger] CTS test for Android Security b/25928803 am: 5a1647bab1 am: 3303e1e28c

Change-Id: Id398f729c2a939f012d5d4718c72c7ce502a2d76