Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: Fix testFormatSameDayTime test for 2020a update [N]" into nougat-cts-dev am: 91c5ba594f -s ours" into nougat-mr1-cts-dev am: 72c5d3d197 -s ours" into oreo-cts-dev