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

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

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



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