[automerger skipped] Merge "audio: enable frameworks/av bpfmt PREUPLOAD hooks"...

[automerger skipped] Merge "audio: enable frameworks/av bpfmt PREUPLOAD hooks" into main am: 544bfd01 am: 2db5641a -s ours

am skip reason: Merged-In Iaf2a6474f09c8017b883a2cb2a08ff6087cdd84d with SHA-1 99486a62 is already in history

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



Change-Id: I0af08e5332a25486a2a64abbaf19c0966461d6cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>