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

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



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