[automerger skipped] Merge "Broadcast Bluetooth state to OFF properly" am: 0d2b668d am: ca00520e -s ours

am skip reason: Merged-In I3936766ab8bdd45d59550dacb64bdc0323bb424d with SHA-1 80f2ad68 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1724470

Change-Id: Ic9e943eae096b776232a6f2cc81ce654e13ab388