am a96d8a11: Use SystemClock.uptimeMillis() for event time

Merge commit 'a96d8a11e84ef9219eb40a815e82ad8a3d852ca5' into gingerbread-plus-aosp

* commit 'a96d8a11e84ef9219eb40a815e82ad8a3d852ca5':
  Use SystemClock.uptimeMillis() for event time