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

Change-Id: I11595e796776a32e0541f2c8f0ae056d017388ce