[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 skip reason: subject contains skip directive

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

Change-Id: I45b762f9a409bb584a6748ea43276622f7c997f7