Merge "Fix flaky test of timer_create_multiple in L." into lollipop-mr1-cts-dev