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