Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 03c8541622

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

Change-Id: I50a1c7ebc99a2bbc90a7e306667e26831d6e3ffb