Merge "Fix flaky tests in RadioOnStateListenerTest." am: d711cd6075

Change-Id: I8bc925808103850ddd33f6915a4230c7bead09b6