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 skip reason: subject contains skip directive

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

Change-Id: Iddce245066df6b85de2a3138c64d96c611e080cd