Merge "Fix libcore.libcore.icu.DateIntervalFormatTest#testEndAtMidnight" am: 60276329c3
am: d0c3d9275d

Change-Id: Iab361c4ef17bf4726184e108d945f69eb49de642