Merge "Optimize activity snapshot for shell transition." into udc-qpr-dev am:...

Merge "Optimize activity snapshot for shell transition." into udc-qpr-dev am: 5f494802 am: 5e1b5698

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



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