Merge "Camera: Fix up torch strength keys." into tm-dev am: e55db702 am:...

Merge "Camera: Fix up torch strength keys." into tm-dev am: e55db702 am: 0d9b9a54 am: 9180a32b am: edf7e433

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



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