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