[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 sc-qpr1-dev am: 73b94e13 -s ours am: 3849c5a6 -s ours am: fdd7a8f4 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I78262302ea0b592e9e9159760fbb6f6b15077f52