[automerger skipped] [RESTRICT AUTOMERGE] Do not resume activity if behind a translucent task am: 43b8bcc0 -s ours am: fc2e4538 -s ours am: 506c8261 -s ours am: 587f0884 -s ours am: c37fbf4a -s ours am: 31e1b86e -s ours

am skip reason: subject contains skip directive

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

Change-Id: I04fa0ad2ce19393d3d260a7d073badec63973e77