Merge changes from topic "RemoteAnimationCanceled_with_Occluded-tm-dev" into tm-dev am: 97641ffe50

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

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