Follow-up CL to the change at aosp/1498277 am: 7d05e6fddd

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic5be309b537bcfaa0bee44623164153da8575c96