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

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



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