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

Change-Id: I8f5b1940840b045582e31bfafe28ff61a2f7f193