Android CTS 5.1 release 7
Merge "Fix flaky test time.timer_settime_0." into lollipop-mr1-cts-dev