[automerger skipped] [RESTRICT AUTOMERGE] Do not resume activity if behind a translucent task am: 51d287d831 am: a60daf1e11 -s ours am: ee5e99a411 -s ours am: 660838d5e4 -s ours am: 6b18891c25 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16713985 Change-Id: I0709840eff0ec2e4e5c24596cc595dc375563ceb
This commit is contained in: