[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-dev am: 9eba99f4 am: 60bb43cd -s ours am: 733ade6f -s ours

am skip reason: subject contains skip directive

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

Change-Id: Iae03c4da8da7bfa47a7d0d13c0e49f599ca802db