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

am skip reason: subject contains skip directive

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

Change-Id: I50ebbef895b709d677e534b57b5756af1ae2fdfd