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

Change-Id: Ib7ae58831e38e00cfb6f493cc9db403a9401eecd