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

Merge "Merge "Camera: Correct torch support query" into tm-dev am: 95925459 am: 42498a76" into tm-d1-dev-plus-aosp am: 2bc728f1

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



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