[automerger skipped] [RESTRICT AUTOMERGE] Do not resume activity if behind a translucent task am: 51d287d831 am: 99a6e00280 -s ours am: 5f15dc2779 -s ours am: 33941fd936 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16713985 Change-Id: I6c43567ceb640ee8d6559458d736579ef22e58a5
This commit is contained in: