Fix mismerge of DSDA: Add InCallUI DSDA support.

Change-Id: I9624f651db40810a77d730b64648738aa3090d29