Merge "[automerger skipped] Merge "DO NOT MERGE Fix tests which relied on Pacific/Apia DST offset. [O-MR1-CTS]" into oreo-mr1-cts-dev am: 61e0123122 -s ours" into pie-cts-dev am: 9fb91d6a1a -s ours am: b86f5c7e54 -s ours am: 559f60b0d1 -s ours am: 1dd591c76a -s ours am: 58a510bf97 -s ours am: b2865952cc -s ours

am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/libcore/+/1903514

Change-Id: I6d9d26f497a7a5c9714ed006a9c5d470bfc0fb0e