[automerger skipped] [RESTRICT AUTOMERGE] Do not resume activity if behind a translucent task am: 8b7e0c52e8 -s ours am: f8857833e9 -s ours am: 1e8500e34c -s ours am: 4c4b48fcd2 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17102592 Change-Id: I7f341aa1184178b57bdc6ac3d9c6cd0cb65159e7
This commit is contained in: