tree a3cdb59cadc5aaf4b44c5db8818177461bdbbaa5
parent 4cd25ff57b245724662db478f9e0393e2ba12946
parent 3c853f0bf2a9595c9f47f2e0db0af9bc2674bc1c
author Mikhail Naganov <mnaganov@google.com> 1644861048 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1644861048 +0000

Merge changes from topic "upstream-hal-v7_1-p4" am: 3c853f0bf2

Original change: https://android-review.googlesource.com/c/platform/system/media/+/1982734

Change-Id: I5d65376886c76d15e9274aedb3cafbd2587e8758