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