[automerger skipped] [RESTRICT AUTOMERGE] Do not resume activity if behind a translucent task am: 628b7851 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ief58d68b0c50539ec6e6fb1de4c4da686dfd6d5b