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: 93478e5c am: 71fa6115" into udc-qpr-dev-plus-aosp am: 2763de81

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



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