Merge "Opp: Fix 'Sent/Received files' notifications being swiped out together"...

Merge "Opp: Fix 'Sent/Received files' notifications being swiped out together" into main am: c8e74f92 am: d13f98b7

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2943265



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