Merge "Merge "Ignore brightness change thresholds for manual changes." into qt-dev am: 8a03eb7842 am: 7543193c34" into qt-r1-dev-plus-aosp
am: fb8b3bb7ca

Change-Id: I32a51325e887946ef058b0c306575097b835c4fb