[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

am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/cts/+/1318398

Change-Id: I3571729a8dd2b9a59fd7530500f72f9aabf87141