[automerger skipped] [RESTRICT AUTOMERGE] Do not resume activity if behind a translucent task am: 8b7e0c52e8 -s ours am: f8857833e9 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I1b9150e4f919856f29277a2bf73da7bc9d2826e6