Merge "Merge "Bluetooth: Move Bluetooth battery stats tracking (1/2)" am: 7df4093371 am: a3fe28806e am: 79b8b354c8  -s ours" into oc-dev-plus-aosp
am: e53d5bd05b

Change-Id: I612e67e6bc95e28ea79a397c9ef0d407e84bbc27