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

Change-Id: I6ee350b161b40f50d92282d8c41e4d7372797422