[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: 8af78977 -s ours am: f83059b8 -s ours am: a25ed3cb -s ours

am skip reason: subject contains skip directive

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

Change-Id: I268fc77de5fb34ccdd06d368918c1dd2b3eb7813