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: 9180a32b

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



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