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

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



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