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: 4623f654 am: c6f2cc55 am: bbd8440f

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



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