[automerger skipped] Merge "[RESTRICT AUTOMERGE] Do not resume activity if behind a translucent task" into rvc-dev am: 057b8a99 am: 711b63a3 -s ours am: 748ed4c7 -s ours am: eaae32a4 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ib4a7a6c716391ae1c32520477ab6a035e2916ad4