Merge "Work around for NPE with shell transition" into tm-qpr-dev am: 6911cccd am: 9080ceaa

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



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