[automerger skipped] Merge "DO NOT MERGE: Fix testFormatSameDayTime test for 2020a update [O]" into oreo-cts-dev am: fe01970c8f -s ours

am skip reason: subject contains skip directive

Change-Id: I000909214fab64ddb058358c09741bdffeabc9a1