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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23921015

Change-Id: Ia1914e4d409ede2adf75a18fc536c98b87230716
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>