commit 229bdcbb6ec359f5274f4e8015a16e7cc995b855
author Adam Lesinski <adamlesinski@google.com> Tue Jan 26 18:18:19 2016 -0800
committer The Android Automerger <android-build@google.com> Tue Mar 01 13:19:15 2016 -0800
tree 0e139c1b6d4df896e8b8457f5123350c1fb23570
parent 5b23737021d756e079230f68cda8920a505c27a1

DO NOT MERGE ANYWHERE: Don't change screen on time on time changes

Screen on time should be measured in elapsed realtime, not wallclock.

Cause a checkIdleStates to occur when reloading stats
(on rollover and on time change).

When time changes occur in the negative direction, the new stats file
we create can overlap the previous one with regards to its end timestamp.
Use the begin timestamp to determine which of the latest stats to merge.
(b/22716352)

Bug: 26488100
Change-Id: If31b29bbbee9e98401205b5e26bce86e181286e7
(cherry picked from commit 9d89bd5cb891dbc9b45b72aa291cbb9fc39b023c)