Merge "CtsSecurityTestCases.android.security.cts.StagefrightTest#testStagefright_cve_2016_2507" into main