Merge "DO NOT MERGE: Fix testFormatSameDayTime test for 2020a update [N MR1/N MR2]" into nougat-mr1-cts-dev