Merge "DO NOT MERGE Fix tests which relied on Pacific/Apia DST offset. [S-V2]" into android12L-dev