[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: 65c0b97f -s ours am: 9f2d29f3 -s ours am: 65ba128c -s ours am: 61b14ab8 -s ours am: 4894608c -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ifc20f9a59a976415655c50364c8b6853287969d1