Merge "[automerger skipped] [RESTRICT AUTOMERGE]: STS test for Android Security CVE-2018-9471 am: 1545e4f908 am: 9275e482a1 am: 0cfeeab81e -s ours am: c45aee449f -s ours am: c815b41d6a am: 67a6b7b854 am: b060d43b08" into qt-qpr1-dev-plus-aosp
am: eca9b79935 -s ours
am skip reason: subject contains skip directive

Change-Id: I650465c3ab8156ac10382ca9ae7cd1c1f62d9924