Merge commit '585279ec7a64f4746b554b434c8b99f577633272' into am-45b398c5-1b45-4876-91cb-b88473f164b9

* commit '585279ec7a64f4746b554b434c8b99f577633272':
  STS test for Android Security CVE-2019-2054

Test: cts-tradefed run cts -m CtsSecurityBulletinHostTestCases -t
android.security.cts.Poc19_05#testPocCVE_2019_2054
Bug: 129559484
Bug: 119769499

Change-Id: Ib22973c8b15a542ed63e19edba5fe82c96903fb1