Merge "Display correct expiration time of service record" into main am: c5ba28161d am: 04f35f4134

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

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