am f1d14f6a: Do not advance mLastEventTime when enabling or disabling user activity.

Merge commit 'f1d14f6a33bc6086db52a77b6a1217452b7eac90' into eclair-mr2

* commit 'f1d14f6a33bc6086db52a77b6a1217452b7eac90':
  Do not advance mLastEventTime when enabling or disabling user activity.