Merge "[DO NOT MERGE] Revert "Allow user to block individual apps from resuming"" into rvc-qpr-dev am: c8f18d19a2

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

Change-Id: I201e5d48c57dd38bb966c8aaf53999e082756468