[automerger skipped] Merge "Update shim method to the updated API name" am: 96c393acf7 am: 7acb260e45 am: cb22d3a1fe -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: I9c9f10908feedc89d94b58707c124633a9595c70