Merge "Merge "camera: make waiting for state more accurate" into tm-dev am:...

Merge "Merge "camera: make waiting for state more accurate" into tm-dev am: 1b80a837 am: bc8d6cde" into tm-d1-dev-plus-aosp am: b08ad2ed

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



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