[automerger skipped] Merge Android R am: 7c8eac3f -s ours am: bf455e4d -s...

[automerger skipped] Merge Android R am: 7c8eac3f -s ours am: bf455e4d -s ours am: f24d4c7a -s ours am: b656bae6 -s ours am: a6a181fa -s ours

am skip reason: Change-Id Ic631e8ecb86b04183b3635581255bf0d0d43242d with SHA-1 2e6fd72b is in history

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

Change-Id: I997a8fbbffd2154c8eeb8f99f1541a8f79b6bc7d