[automerger skipped] Merge changes Id88d546a,I14c23eea,I08286bff into...

[automerger skipped] Merge changes Id88d546a,I14c23eea,I08286bff into rvc-qpr-dev am: 763b935e -s ours am: 7ccaad67 -s ours

am skip reason: Change-Id Id88d546a22db26495a6d535cbf3e191a21ea21fd with SHA-1 148fc20f is in history

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

Change-Id: I748d6c44285e30ea2eede7b2acae6eea3d470f8c