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: a150d77b am: 4ac2dc38 am: 8830d6d9

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



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