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

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



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