[automerger skipped] Merge "[RESTRICT AUTOMERGE] Do not resume activity if behind a translucent task" into rvc-qpr-dev am: d4ef6e49a1 -s ours am: e4f01f7717 -s ours am: a83d65e7aa -s ours am: 7a40de6568 -s ours am: d993c9605d -s ours

am skip reason: subject contains skip directive

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

Change-Id: I071dd443537f0520c48d170818670074e66de78a