[automerger skipped] Empty merge of sc-v2-dev-plus-aosp-without-vendor@8433047...

[automerger skipped] Empty merge of sc-v2-dev-plus-aosp-without-vendor@8433047 am: 2a8b9b1f -s ours am: f6d4f421 -s ours am: 84c38c1d -s ours

am skip reason: Merged-In Id7a5d5728332e94e96eeb32f6b57875a5e78c47f with SHA-1 8db4ae2c is already in history

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



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