[automerger skipped] Merge "[RESTRICT AUTOMERGE] Do not resume activity if behind a translucent task" into sc-v2-dev am: 351f990172 am: 181d454887 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ia3e38ce50fdfafaf284d87e7b68e0c016561351f