Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: Fix testFormatSameDayTime test for 2020a update [N MR1/N MR2]" into nougat-mr1-cts-dev am: 101a6598f8 -s ours" into oreo-cts-dev am: 92327f668f -s ours" into oreo-mr1-cts-dev am: 30a016e99c -s ours

am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/cts/+/1318398

Change-Id: If91940ef3cbcd37312733820f956d14a56b4bf84