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 am: 100bfc21

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



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