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 am: 2f36a61c" into tm-qpr-dev-plus-aosp am: 0c1b69ef

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



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