Merge "Camera: Fix up torch strength keys." into tm-dev am: e55db70293 am: 0d9b9a5452 am: 65f935ce9c am: f9361d0149

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

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