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 am: a5ec20f8

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



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