Merge "Add support for multiple lux thresholds for camera privacy light" into...

Merge "Add support for multiple lux thresholds for camera privacy light" into udc-qpr-dev am: 58eb008b am: 4c050349

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



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