[automerger skipped] [RESTRICT AUTOMERGE] Do not resume activity if behind a translucent task am: 8b7e0c52 -s ours am: f8857833 -s ours am: 2e6ae6fc -s ours

am skip reason: subject contains skip directive

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

Change-Id: I8b456ac6125e944d5223d036022bd73f0bd6341b