[automerger skipped] Merge changes from topic "upstream-hal-v7_1-p3" am:...

[automerger skipped] Merge changes from topic "upstream-hal-v7_1-p3" am: 6651930c am: 08705b86 am: 576f4454 -s ours

am skip reason: Merged-In Id8b39b4058371b72ca02af78c70be7daa5aa1e44 with SHA-1 accbe8a0 is already in history

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

Change-Id: I4b6dd914f8f9fbd20726ce9af42b1129bf44de66