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

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



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