Merge "Fix StructXfrmLifetimeCurTest failure when default timezone is not GMT" into main am: 3841508237

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2850828

Change-Id: I0bf83daef7e65edca3afccbc4b3f43e39434d498
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>