Merge "Cancel unocclude animation on main thread" into tm-qpr-dev am: ac8ef32b22

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

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