Merge "Change VideoDecoderPerfTest semantics for mainline" am: 1dd6b532a5 am: bc1ad7d786

Original change: https://android-review.googlesource.com/c/platform/cts/+/2045377

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