[automerger skipped] [RESTRICT AUTOMERGE] Do not resume activity if behind a translucent task am: 628b7851dc -s ours am: 49010d1f9d -s ours am: ea04722b7c -s ours am: f2aab36ed0 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16713866 Change-Id: I2c86958b0a54c48ea8b4ec76181a11369dbbfc4e
This commit is contained in: