[automerger skipped] Merge "Filter out notif updates based on active media...

[automerger skipped] Merge "Filter out notif updates based on active media session" into rvc-qpr-dev am: fe614e07 am: 77735acd -s ours

am skip reason: Change-Id Ia7b8d2f3df3e68f63049e3443315fc26811efec4 with SHA-1 0e098127 is in history

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

Change-Id: I4e5cd688f646b0fd2546519297487bd1dc385fea