[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 0ccfa41c am: 53e476db -s ours am: 9d48f26b -s ours am: 6a9c77ad -s ours am: 20838907 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I24b74e880b058cc1bc13f6ef6a636cda3f85c9ff