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

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

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