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

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

Change-Id: I616eeefabf8d097628eb5984e38e36471afe6ae1