[automerger skipped] Merge "Merge stage branch to development trunk." am:...

[automerger skipped] Merge "Merge stage branch to development trunk." am: 512ee597 -s ours am: a6d107c0 -s ours am: de1759dd -s ours

am skip reason: Change-Id I869b8567bbccfef1ccad01f47cdf5138935b6996 with SHA-1 ba8fee2a is in history

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

Change-Id: I4d3625c6cc5332b74eca2e62acef3f0e632c5275