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: 3acd5090

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



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