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

[automerger skipped] Merge changes from topic "upstream-hal-v7_1-p4" am: faab202a am: 4dd84e0f am: 16a3f820 -s ours

am skip reason: Merged-In I95bafe631059ebd4183722e676d26fb271f5a0b5 with SHA-1 e08673de is already in history

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

Change-Id: I7c6434b49a4d631071c5c128735a9a9088d6f112