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

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



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