Merge "Merge "Bluetooth: Move Bluetooth battery stats tracking (1/2)" am: 7df4093371 am: a3fe28806e" into nyc-mr2-dev-plus-aosp