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

[automerger skipped] Merge "Camera: Flush all state transitions before reconfigureCamera" into udc-qpr-dev am: d667e38b -s ours am: 389fdbe5 -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: I3776909a9db859a0e7d1541edfd220699851fda4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>