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