Merge "Solve flakiness of RadioOnStateListenerTest"