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

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



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