[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: abd62d1f0f -s ours am: 9bb7647220 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16713864 Change-Id: Ie2e152897e5eed64d6cb354f2ecd809184994c77
This commit is contained in: