[automerger skipped] Merge "DO NOT MERGE Fix tests which relied on Pacific/Apia DST offset. [P-CTS]" into pie-cts-dev am: aef3dc4fa5 -s ours am: f56d2e6962 -s ours am: 0d242d8580 -s ours am: 512527dc51 -s ours am: 674a2c7dd8 -s ours am: 2b7abe3f1f -s ours

am skip reason: subject contains skip directive

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

Change-Id: I5302619a0681a6c2a3c190e72273db7942aa7cb0