Merge "Show favorites in customized view" into ub-contactsdialer-g-dev
am: 145dc0a666

Change-Id: I2466c03659c3fe30429c38d172f608bbf1569e98