Merge "Rename mBrighteningLuxThreshold to mAmbientBrighteningThreshold in ABC log info." am: 980c231cf8 am: 3e984dd0e7

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

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