[automerger skipped] Merge "Fix issue where cold-start launching an activity...

[automerger skipped] 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 am: 466149ed -s ours am: 7e821597 -s ours am: 03b1bd75 -s ours am: c8dd009c -s ours

am skip reason: Merged-In I57c57cbb156dae79fa46e917285330f07ff7edce with SHA-1 432e0353 is already in history

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



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