[automerger skipped] Merge "[RESTRICT AUTOMERGE] Do not resume activity if...

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Do not resume activity if behind a translucent task" into rvc-dev am: 057b8a99 am: 711b63a3 -s ours am: 748ed4c7 -s ours am: eaae32a4 -s ours am: e64e5d8c -s ours am: 747ee9bd -s ours am: 436fb542 -s ours am: 109193a6 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I1cc74c9c25a5d708ee32b193a244ce9206b55f10