[automerger skipped] Merge "[RESTRICT AUTOMERGE] Do not resume activity if behind a translucent task" into rvc-dev am: 057b8a994b am: 711b63a3ea -s ours am: 748ed4c7cb -s ours am: eaae32a449 -s ours am: e64e5d8cb2 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I15433bc349bc22ebe02b12bdeb6a6a701dbd507f