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 sc-v2-dev am: 196fc30c

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



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