[automerger skipped] Merge "Allow user to block individual apps from resuming"...

[automerger skipped] Merge "Allow user to block individual apps from resuming" into rvc-qpr-dev am: 3743d552 am: 865643a1 -s ours

am skip reason: Change-Id I8c85bc937aeaf366954f2669eba8f6954640fe4c with SHA-1 a26e51bc is in history

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

Change-Id: Ibe98570bca08f08925ca0027aaba0b346f031563