Merge "Keep actions on new call log entries consistent with those in the old call log." am: affbe0e40d
am: c070bf648f

Change-Id: I52df456186b8869ac71d55939aee56a33d3af185