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

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

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