Merge "Enforce call log length limit on a per PhoneAccount basis."
am: 647b520a00

Change-Id: I8962fc326d0e2888656c2764e94131c6eebd1471