[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 am: 2fc56ad728 -s ours am: 3c4d8821e4 -s ours am: 0f795e6e20 -s ours am: 14cb7364ee -s ours am: d403c38205 -s ours am: a3899efb11 -s ours am: ef98930bfa -s ours am: d71c8cca92 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ib03c965ffe7cb443eaf5f963489bdec027bcb7db