[automerger skipped] [RESTRICT AUTOMERGE] Do not resume activity if behind a translucent task am: 43b8bcc0 -s ours am: fc2e4538 -s ours am: 506c8261 -s ours am: 93742174 -s ours am: 11583e24 -s ours am: 7f6475ab -s ours am: 5fda46f6 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16811765

Change-Id: Ib40d7b70bdbc0261fae65fd18712a496ce83680e