Merge "Skip snapshot task when finishing activity for shell transition" into...

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

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



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