[automerger skipped] Merge "Update shim method to the updated API name" am: 96c393acf7 am: 7acb260e45 am: 2c0c2cd4d3 -s ours

am skip reason: skip tag Change-Id I3a8b5020d0bd1c95e3a75910322301b5596be823 with SHA-1 4ef475f287 is already in history

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

Change-Id: I0fdfd12989ae9352ef04ab10b3f74f863b366de8