Merge "Merge changes from topic "shell-transition-bugreport" into udc-dev am:...

Merge "Merge changes from topic "shell-transition-bugreport" into udc-dev am: 42df3d41 am: 0131038d" into udc-d1-dev-plus-aosp am: bf7f8fe8

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



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