[automerger skipped] Merge "[RESTRICT AUTOMERGE] Do not resume activity if behind a translucent task" into sc-qpr1-dev am: 73b94e13cb -s ours am: 3849c5a642 -s ours am: fdd7a8f4ed -s ours am: 714fe08825 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16713866 Change-Id: I6ab1194b7d4ae121f4ab5a820572a0a9d7537786
This commit is contained in: