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

Change-Id: I3c53626182c2da373e74843f3e29b0305ca6c5d8