Merge "camera:fix wait request timeout in switching camera" into main am: 16bf9fca

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



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