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

[automerger skipped] Camera: Flush all state transitions before reconfigureCamera am: 2b407e5b -s ours am: e141e895 -s ours

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

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



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