[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: 8b7e0c52 -s ours am: f8857833 -s ours am: 1e8500e3 -s ours am: 4c4b48fc -s ours am: da7b7bdd -s ours am: 213b6e2f -s ours

am skip reason: subject contains skip directive

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

Change-Id: I16aa89a7253249a3cd7eaed3de585f39c680b987