Merge "Skip snapshot task when finishing activity for shell transition" into udc-dev am: 02503f1111 am: a150d77b41

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

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