[automerger skipped] Merge "Ensure the next activity of non-focusable task to...

[automerger skipped] Merge "Ensure the next activity of non-focusable task to be visible" into rvc-qpr-dev am: b33de1f6 am: bf41100f -s ours

am skip reason: skip tag Change-Id I4f02758287ca4ef0e710bb556b5910600e725e40 with SHA-1 fc165b97 is already in history

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

Change-Id: Id6a94922bd38370fb4cb8a326662730fccc65543