Android CTS 5.1 Release 24 (4340933)
Merge "Fix flaky test time.timer_settime_0." into lollipop-mr1-cts-dev