[automerger skipped] [automerger] [RESTRICT AUTOMERGE]: STS test for Android Security CVE-2016-2483 am: 0dbe811c69 am: 80b0cb9c61 am: 05da5e3865 am: 2e3c8529cd skipped: 9190c5e3a3 am: 16c15360c9 am: 131cf5ab96 am: 2f7fa069f9 -s ours am: 7ad20dcb74 -s ours
am: 8c9bb7c598

Change-Id: Ic6f10f7d38a19a97f6091de284165fa8694a67e0