Merge "Switch shell-transit default to screenshots" into tm-qpr-dev am: d6a46c43

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



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