[automerger skipped] Merge "[BT] Correct the filter when addCachedDevices"...

[automerger skipped] Merge "[BT] Correct the filter when addCachedDevices" into udc-qpr-dev am: 683296f1 am: 9e62a492 -s ours

am skip reason: Merged-In I95b16840881747ec9f69e5cd778e456bcc8a7626 with SHA-1 8dd32ab0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24025004



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