Contacts: Null check local group query result

Change-Id: I1240c73362ea946b906ecb9ecd27a2bcb0b8e545
Contacts: Remove unused strings

Change-Id: Ib477c4f24e5e5c4b7222212ea25c38e0161608b1
Merge remote-tracking branch 'cm/cm-11.0' into HEAD