Merge "Camera: Correct torch support query" into tm-dev am: 95925459 am: 752e639a

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



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