Merge "Merge "Suppress IndexOutOfBoundsException when cancelling low light animation" into udc-dev am: dcc5cf1712 am: a0aae01389 am: ea1a63a9ec" into udc-qpr-dev-plus-aosp