Merge "Merge "Merge "Bluetooth: Move Bluetooth battery stats tracking (1/2)" am: 7df4093371" into stage-aosp-master am: 7e93a915a6" into nyc-mr2-dev-plus-aosp am: f945e97a37
am: a275819a31

Change-Id: I8a52c328da60d5e80596fbeac450ed4d2a65bb2c