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

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



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