Merge "Record Bluetooth Cumulative Stats Properly" into pi-dev am: 827a06d4b4
am: 0f8667423f

Change-Id: I5e02a0d410ec64d37a6917471e2cb776c373cc12