[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: 3c131e3564 -s ours am: f0f7337887 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I4cb2c02ab747a21e419f006ae09ca86e442f96ae