Merge changes from topic "shell-transition-bugreport" into udc-dev am: 42df3d41 am: 9b85948c

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



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