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

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



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