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

Change-Id: I517ad463c830bb55aaa2b207816c185182987a09