Merge "Merge "Bluetooth: Move Bluetooth battery stats tracking (1/2)" am: 7df4093371" into stage-aosp-master
am: 7e93a915a6

Change-Id: Ia70f2280c410af337be5ffa59e4d442a2e073055