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

[automerger skipped] Rename variables and methods specifically am: 5abdc91e am: f0c65f48 -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: I5001d36af148a8a05de51b21bdf7e4f3711ccf74