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: 0687aefc

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



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