[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: 577ae0bd am: fe532bb7 -s ours am: 7c0613fc -s ours am: 501779ac -s ours am: 102ab545 -s ours

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

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



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