[automerger skipped] [RESTRICT AUTOMERGE] Do not resume activity if behind a...

[automerger skipped] [RESTRICT AUTOMERGE] Do not resume activity if behind a translucent task am: 43b8bcc0 -s ours am: fc2e4538 -s ours am: 506c8261 -s ours am: 587f0884 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ia7f980bad17c4157ca0be951b0c017d3a30f6d40