Merge "Transfer remote animation option from an intercepted activity." into tm-dev am: 6c937bea

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



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