Merge "Call icon can't be displayed correctly" into ub-contactsdialer-h-dev am: f5abe51551
am: ac6eeabf1f

Change-Id: I8958b276f7b7df4dd1ca795241f7182a2c423877