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