[automerger skipped] [RESTRICT AUTOMERGE] CTS test for Android Security b/62896384 am: 6b20b20bd5 -s ours am: d4a423d1d8 -s ours am: 11eff69f38

Change-Id: Iee52fefdfb3ef7d2e4a13351c51a2b01b1ad19c5