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

Change-Id: I8b13e80fe6fbac8f46fd10897692464024472a80