Merge "Camera: Correct torch support query" into tm-dev am: 95925459 am: 42498a76

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



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