[rilmodem] Style fixes for call waiting

Fix review findings

Signed-off-by: Petri Takalokastari <petri.takalokastari@oss.tieto.com>
Merge branch 'cw' into next