Merge "Adding fields for time elapsed for headset device events." into oc-dr1-dev am: b5e79ad0d3
am: 029498f856

Change-Id: If23e825d4766199afea5a2113cd16a57ffe083eb