Merge "Merge "Do not use max/min luminance if it's 0 am: f3f9288eae am: 9c3163c38b" into rvc-d1-dev-plus-aosp am: bea2f35370" into rvc-qpr-dev-plus-aosp am: 6d10c52987

Change-Id: I40962c62ef11591670448b9ca2667cf4d247d90d