[automerger skipped] Merge redfin/bramble support. am: 550590ba -s ours am:...

[automerger skipped] Merge redfin/bramble support. am: 550590ba -s ours am: f2daaef3 -s ours am: 6b024d1e -s ours am: bb9d9ac8 -s ours am: 4eafd367 -s ours

am skip reason: Change-Id I4cb8df92b5155ae9fd906bce14cd7fd512a35af0 with SHA-1 7383f3de is in history

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

Change-Id: I314ad790fbff3cc006d9767b8db3a8dc9613f8c0