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

Change-Id: I414eba2ec5d63f45666076ca48ef1cd58805654f