[automerger skipped] Merge "[ALPS09070588] Camera splitter bug fix" into main...

[automerger skipped] Merge "[ALPS09070588] Camera splitter bug fix" into main am: bc74e235 am: c1eb338f -s ours

am skip reason: Merged-In I0eebecac622d9796d104be50a88a93d9e9896dcf with SHA-1 63c6c23a is already in history

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



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