[automerger skipped] Merge "[DO NOT MERGE] StagefrightTest: call codec.stop() before codec.release()" into stage-aosp-sc-ts-dev am: 64a9f23710 am: 717d37afc1 am: c458d3aad6 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I6add7fe8822ba9e0afb1508024b7dae23ff7028f