[automerger skipped] [RESTRICT AUTOMERGE] Do not resume activity if behind a...

[automerger skipped] [RESTRICT AUTOMERGE] Do not resume activity if behind a translucent task am: 0a4f661e am: 11f5a2b8 -s ours am: c9cb6df0 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I941c69b8773a7d7e100af11a751a203ebd797338