Merge "Change the framework api for a constant in CallLog.Calls"