[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-qpr-dev am: d4ef6e49 -s ours am: e4f01f77 -s ours am: 631b1f2b -s ours am: 2a137076 -s ours am: 97f66a77 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I8215899d9c721e41dc6b3a88c1f042a2461cdf03