Merge changes from topic "refresh-record" am: c823dc2259

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

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