Merge "Merge "Bluetooth: Move Bluetooth battery stats tracking (1/2)" am: 7df4093371 am: a3fe28806e am: 79b8b354c8  -s ours" into oc-dev-plus-aosp