Merge "Exempt ongoing and media notifications from unseen filter" into tm-qpr-dev am: 56b489b5

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



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