Merge "Support shell transition for restarting process of activity" into...

Merge "Support shell transition for restarting process of activity" into udc-dev am: 882f5220 am: 4f2af474

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



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