[automerger skipped] [RESTRICT AUTOMERGE] CTS test for Android Security b/62887820 am: 3bcf0f6687 -s ours am: e6c73b6721 -s ours am: 0497a246a0

Change-Id: Ib9dbd06072db49a84cc6fd33f13c4d7e56b07a31