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

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

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



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