Merge "Add @NeededForTesting to GroupsDao" into ub-contactsdialer-g-dev
am: 92a3d860c9

Change-Id: I608a9f3546b796b056205d6cf85db434eaf8d558