Merge "Merge "Bluetooth: Move Bluetooth battery stats tracking (1/2)" am: 7df40933" into stage-aosp-master