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

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



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