Merge "Broadcast Bluetooth state to OFF properly" am: 0d2b668d70

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

Change-Id: Id3154a352ebc74b59e7099713c5c1bf6a1ee9232