Merge "Merge "Rename mBrighteningLuxThreshold to mAmbientBrighteningThreshold...

Merge "Merge "Rename mBrighteningLuxThreshold to mAmbientBrighteningThreshold in ABC log info." am: 980c231c am: 3e984dd0 am: e78b6e54" into udc-dev am: 7a7a848d

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



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