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

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

Change-Id: I49ef2b4eae021493b3dde18a630215ec677a8712