Excluding invisible contacts from aggregation

Bug: 3184559
Change-Id: If4b75548477cc296107d233fb6678c266fb0ca94
6 files changed