Merge "Fix brightness change during screenrotation am: 4546de0814 am: 309f714afe" into udc-qpr-dev-plus-aosp