[automerger] CTS test for Android Security b/63852675 am: 5f8617dcad am: 57aa950a81

Change-Id: I2ac2401ba8e84a207a33fc079be23b96a3499759