Merge "Camera: Flush all state transitions before reconfigureCamera" into main...

Merge "Camera: Flush all state transitions before reconfigureCamera" into main am: 90940c49 am: ced31c71

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



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