Merge "Fix issue where cold-start launching an activity from the shade while...

Merge "Fix issue where cold-start launching an activity from the shade while an occluding activity is visible would result in an inescapable black screen." into tm-dev am: d35b3ee1 am: 50721a15

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



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