[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: 7ca988ca am: 62384851 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12597795

Change-Id: Iab656363e6cda1b5803b95d8feffcdb74a77b0e6