Merge "Fix Bluetooth power accounting after a BT crash" into sc-dev am: cfc8359f am: 04e4cc4a am: f5a9793b

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

Change-Id: I2a7a1739ea7f86ba1a7a4147a43d813092ffa125