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

am skip reason: subject contains skip directive

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

Change-Id: I3f8ff56668d075ae1ebd2f41ac218a00518f0d41