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

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



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