[automerger skipped] Merge changes I86cb5af0,I706e40db into rvc-dev am:...

[automerger skipped] Merge changes I86cb5af0,I706e40db into rvc-dev am: d8fa6685 am: ce92fc94 -s ours am: a711d406 -s ours

am skip reason: Change-Id I86cb5af059fe81fe9f10555d57096164665205db with SHA-1 c14ac728 is in history

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

Change-Id: Ie6d2b203b1018d43a35d29b1b58871399e36f626