Merge "Clarify timestamp definition for SensorEvent" into rvc-dev am: e39527ff51 am: c6817e3d83

Change-Id: I25b661d2dba8bf98dbffe90782ec18892a56ef41