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

Change-Id: I7e5b836f6b10b6b00bf4dc65cec8440f299ad0f1