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: c2bb2ff6 am: 2e80bd98 am: 793b2663

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



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