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

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



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