[automerger skipped] Merge "Only filter when remote session has associated...

[automerger skipped] Merge "Only filter when remote session has associated notification" into rvc-qpr-dev am: c6095a41 am: 74606dde -s ours

am skip reason: Change-Id Ifc404be2de6f5f87a1d43e3b51d3ca00c73c6e06 with SHA-1 8cc72bdf is in history

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

Change-Id: I3a749b3b513aeba121749e1428681f33fb55428a