Merge "Remove unnecessary animation cancellations when exiting low light" into...

Merge "Remove unnecessary animation cancellations when exiting low light" into udc-qpr-dev am: ba2650d9 am: 768ea680

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



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