Merge "Bluetooth: Use elapsed real time for calculating onDuration" am: 22b12e6b06
am: e57c02e860

Change-Id: If51a8d59d621cc9578d95df7d86903cec5628935