[automerger skipped] Merge Android R am: 7c8eac3f64 -s ours

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

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

Change-Id: I6c0f4a0ac78cac9ec40f95839a253e3bd3590fe8