[automerger skipped] Merge "RESTRICT AUTOMERGE Make task visible if activity...

[automerger skipped] Merge "RESTRICT AUTOMERGE Make task visible if activity launched behind" into rvc-qpr-dev am: 28c7e80a am: 60c02f07 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I3804ff975196df3f695ca0f753ca5e75f933ebbd