Merge "Fix timer flaky test in lollipop-mr1-cts-dev." into lollipop-mr1-cts-dev