Merge "Merge "Plumb Scene-transition tag through shell transitions" into...

Merge "Merge "Plumb Scene-transition tag through shell transitions" into udc-dev am: de91c389 am: 7c89f7ed" into udc-d1-dev-plus-aosp am: 18e1561f

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



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