[automerger skipped] [RESTRICT AUTOMERGE] Do not resume activity if behind a translucent task am: f2d47874 am: 72aa97e7 -s ours am: 75ced03a -s ours am: 92e566d2 -s ours am: 5c5b8374 -s ours am: 220b723c -s ours am: 73d2bc87 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Id003bec32b61887864fa4d79527811d6e21e5479