Merge "DO NOT MERGE: Fix testFormatSameDayTime test for 2020a update [O]" into oreo-cts-dev