[automerger skipped] [RESTRICT AUTOMERGE] Do not resume activity if behind a translucent task am: 51d287d8 am: a60daf1e -s ours am: ee5e99a4 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I98325f81804d26044aeda9abb5c60f46847bf21b