Merge "Follow-up CL to the change at aosp/1523097." am: eacfd4f49b

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

Change-Id: If90156470c712618c58122d2916d2913cb2505f2