Merge "Camera VTS: Improve test for torch callback" am: 4e2f9e22d9

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/19997205

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