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

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



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