Merge...

Merge "CtsSecurityTestCases.android.security.cts.StagefrightTest#testStagefright_cve_2016_2507" into main am: 8e45cd12 am: 3a4e594a

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3256358



Change-Id: I2ad6b01d721243eb0d6a8af85db5b2b7bb7e013c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>