Merge "Don't cancel notifications when pausing work apps" into udc-dev am:...

Merge "Don't cancel notifications when pausing work apps" into udc-dev am: 7c966b0c am: d5cae70e

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



Change-Id: Idfc054070c903db4ab1adf6d03927d5d215f407c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>