[automerger skipped] Merge "Cancel scan when PendingIntent is cancelled" am: bf481664 am: 2fec02de -s ours

am skip reason: Merged-In Ib4211bc8feed856d8ac37078efbee0f46e140493 with SHA-1 1c68f9f9 is already in history

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

Change-Id: Ia598bb6b1fa64fd917b8424af3c4b05d45467947