Merge "Move Bluetooth battery stats tracking (2/2)"
am: 78387a7039

Change-Id: If66f93f7cd27f6362ebdc30898b2e64a636dfcb4