Address comments on shim library changes. am: 52f7eb12c8

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib77e867717c5f2a6faabb04b7f5ee45445c27e8d