[automerger] [RESTRICT AUTOMERGE]: STS test for Android Security CVE-2016-6789 am: 673a7f6c54 am: 74d40073a2

Change-Id: I36cf8b212bf03fdd0e1e5aeee14633982ed1f9c3