[automerger skipped] Merge "[RESTRICT AUTOMERGE] Do not resume activity if behind a translucent task" into sc-dev am: 9eba99f414 am: 60bb43cddf -s ours am: 733ade6fbf -s ours am: 4568632494 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16713985 Change-Id: Ia9d1116bed5c76cfbc155fe9f2e9440c9ff59066
This commit is contained in: