[automerger skipped] Merge "Merge "Merge "Merge "Update test case name for new Stagefright test" into marshmallow-cts-dev am: 6a4edf34a0" into nougat-cts-dev am: 09e61c0aef" into nougat-mr1-cts-dev am: 6ea4e1e7d4" into oreo-cts-dev am: 4363a4df6e  -s ours am: dbf879c6b5 am: d5257fb4e1
am: c36b24f948

Change-Id: I8bc8720ce81474e904170aadeaeb1e719ca5c328