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: aafbe2cf am: 06015cac am: 0d77161a

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



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