Merge "In the coalesced call log, replace column NUMBER_CALLS with a new column COALESCED_IDS." am: ae916b9c33
am: 92d803d249

Change-Id: I933dde742c83eb3eee25959f21bea9c7346939c6