More minor code cleanups in the telephony framework. Change-Id: I27abe11e02fc6fea12885eea4fe275240a546332