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

Change-Id: I6c345698c217877aaf3e087b99bef7e6f44bb850