[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: ea4bc25e am: 3d8d9728 -s ours am: 1e924802 -s ours am: 3a36a355 -s ours am: 8d1517f6 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I96a1c74545b8a75828cf5d99b7d8c4cfcee1de44