[automerger skipped] Merge "[RESTRICT AUTOMERGE] Do not resume activity if...

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Do not resume activity if behind a translucent task" into qt-dev am: 88bdf80a am: c0d12c6b -s ours am: 9d5c0bf1 -s ours am: f36ed930 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Id84deef83bd9641d9a366ed7fff49c545fc1b53e