Merge "Address API concerns for isConcurrentVoiceAndDataAllowed and...
Merge "Address API concerns for isConcurrentVoiceAndDataAllowed and OnReceiveUssdResponseCallback." into oc-dev am: 37bbb789
am: a3c05485
Change-Id: Iec17862e992d1597741d376dabcbf602aef72923