Merge "Adjust the padding of list item in the contact list" am: f4a0a40bb5 am: 0cf443bbdb
am: be6183bc34

Change-Id: I026b2585d746eb73a30df133498d4e1d4062c2d9