[automerger skipped] Merge "Fix libcore.libcore.icu.DateIntervalFormatTest#testEndAtMidnight" into pie-cts-dev
am: fc7b371715 -s ours
am skip reason: SHA1 fc7b371715 skipped by user tobiast

Change-Id: If587b38cc7bc96f87ea4dc628a09fa27716c55d7