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 am: e29ff464f4 -s ours am: 996ff0094b am: 142360572a am: a5a98aa232 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I87d66befc4debd987f63d29e433e411d2c9e4926