Merge "Set occluded = false if occlude remote animation is cancelled." into...

Merge "Set occluded = false if occlude remote animation is cancelled." into tm-dev am: 13e74f97 am: c8f8b28b am: 2c39a181 am: 14e36b22

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



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