[automerger skipped] [RESTRICT AUTOMERGE] Do not resume activity if behind a translucent task am: 51d287d831 am: a60daf1e11 -s ours am: ee5e99a411 -s ours am: 660838d5e4 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I774eb7d87d23381c3392a53ef4319ad84de5cb98