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

Change-Id: I3038e805004af042ba61cdf4717bbfd192688a04