Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: Make the tests permissive for O android.media.cts.DecoderTest#testHEVCDecode30fps3840x2160 Bug:76404085 Test: Build CTS Test: run cts -m CtsMediaTestCases -t android.media.cts.DecoderTest#testHEVCDecode30fps3840x2160" into oreo-cts-dev am: 15219c5c64  -s ours" into oreo-mr1-cts-dev am: 857b475939  -s ours" into pie-cts-dev