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

Change-Id: I7dba12c8e0fed07cf31efba3bff4c74846af9370