Build API 31 shims against module_current. am: ffe871697a

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iefcb841e69c40dc83fa14eaffbcee07b0a60769d