Merge changes from topic "RemoteAnimationCanceled_with_Occluded-tm-dev" into...

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

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



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