Merge "[automerger skipped] Merge "DO NOT MERGE: Fix testFormatSameDayTime test for 2020a update [N MR1/N MR2]" into nougat-mr1-cts-dev am: 101a6598f8 -s ours" into oreo-cts-dev