Merge "Update running remote animation state after activity change" into...

Merge "Update running remote animation state after activity change" into tm-dev am: bad9a217 am: 59abf29b

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



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