[automerger skipped] Rename variables and methods specifically am: 5abdc91e...

[automerger skipped] Rename variables and methods specifically am: 5abdc91e am: 47c393d5 am: 00af6ee5 -s ours

am skip reason: Change-Id I646b4b58df20d1a280c0f472b4573dc350349cc3 with SHA-1 5abdc91e is in history

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

Change-Id: I13853f8026f36a89cac8321f87b6c409ea47714e