[automerger skipped] [RESTRICT AUTOMERGE] Do not resume activity if behind a translucent task am: 51d287d8 am: 99a6e002 -s ours am: 5f15dc27 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I803849b5f8489cdf5c91ac9d6a19f0a61ad3c260