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: I52660f1d05db954a61e48d2f8503698b4994873d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>