Merge "Guard against null SimpleDateFormats when editing events" into ub-contactsdialer-h-dev
am: e5c6d9fccd

Change-Id: I7159677ed1148383a5a72cdaf4dce08e687312d5