[automerger skipped] StagefrightTest: stop running codec after timeout am: c52d5add4d am: f6f09eacae am: 413016db5a am: be486df794 am: bedddb09e0 am: cea3806f39 am: 60b1568683 -s ours am: ac10bd52a7 -s ours

am skip reason: Merged-In I023440a2f25a0f4184713ff1ff478a4889f7d531 with SHA-1 16b89d2b58 is already in history

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

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