Merge "Skip snapshot task when finishing activity for shell transition" into udc-dev am: 02503f11 am: a150d77b am: 116fee14 am: 357e917b

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



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