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: 9b85948c" into udc-d1-dev-plus-aosp am: 2a22dcd6

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



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