[automerger skipped] Merge "StagefrightRecoder: Disabling B-frame support"...

[automerger skipped] Merge "StagefrightRecoder: Disabling B-frame support" into sc-dev am: 09dc306e am: 9a1b832e am: f5e4f29c am: e223bf3d am: 26f1b610 am: bac268ea am: 5db2efe9 -s ours

am skip reason: Merged-In I4098655eb9687fb633085333bc140634441566e6 with SHA-1 af685c66 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/27603872



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