[automerger skipped] Merge "[DO NOT MERGE] Revert "Allow user to block individual apps from resuming."" into rvc-qpr-dev am: 7ca988cab1
am: 62384851e0
-s ours am: b02f236c08
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12597795 Change-Id: Id90db7f3706b52c45a6ac3d65daed92fae99a28f
This commit is contained in: