[automerger skipped] Merge "Camera: Flush all state transitions before...

[automerger skipped] Merge "Camera: Flush all state transitions before reconfigureCamera" into main am: 90940c49 am: ced31c71 am: 5c25f15c am: 5a1692f3 am: c6dd3da1 -s ours

am skip reason: Merged-In I4ceb96b855113cc7e042682df344df6481124997 with SHA-1 6a50b456 is already in history

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



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