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

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

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