[automerger skipped] [RESTRICT AUTOMERGE] Do not resume activity if behind a translucent task am: f2d4787451 am: 72aa97e7eb -s ours am: 75ced03a04 -s ours am: 92e566d24f -s ours

am skip reason: subject contains skip directive

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

Change-Id: I4a7362dff152e108c8d9f31b09e45525e45d96a4