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

Change-Id: I7ab1325d153f47084dc55edcf20b3da501c7b6f1