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