Merge "Merge "Suppress IndexOutOfBoundsException when cancelling low light animation" into udc-dev am: dcc5cf17 am: a0aae013 am: ea1a63a9" into udc-qpr-dev-plus-aosp am: ca1e221c

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



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