[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: 628b7851 -s ours am: 49010d1f -s ours am: ea04722b -s ours am: f2aab36e -s ours

am skip reason: subject contains skip directive

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

Change-Id: I9d7ae80af8babdc064bd2215714057c30ada9251