Merge "Allow user to block individual apps from resuming" into rvc-qpr-dev am: 3743d5526a

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

Change-Id: Ief6bfded76c4fe6d1636f9af1c67659b2b84ab63