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

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



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