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

[automerger skipped] Merge changes from topic "upstream-hal-v7_1-p2" am: bd3adb23 am: 0f367d5c am: 7ed25ef8 am: c4ccacf3 -s ours

am skip reason: Merged-In Ib6ee708d312e4e630637d8b7fb92fda4854590aa with SHA-1 afa586b2 is already in history

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

Change-Id: I609bcb3fe62b50ece4ed8c1834d6752f0e7c0310