Address comments on shim library changes. am: 52f7eb12c8 am: 5f2207604f

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I03a044db7049a91f5b3f6edce101607289513db3