[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE am: 81f6c870 -s ours am: 5579892b -s ours am: be23efb7 -s ours am: 11e6d4a6 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Id1ffeda15053a1cc256fb770b3b410a6011ebb49