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

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

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