[automerger skipped] Merge "[DO NOT MERGE] Revert "Allow user to block...

[automerger skipped] Merge "[DO NOT MERGE] Revert "Allow user to block individual apps from resuming"" into rvc-qpr-dev am: c8f18d19 am: 11785386 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I2e28ffe0102fd70711a1a989b1a9fbd4912caaa6