[automerger skipped] Merge changes Ie0e7d4f7,Ib1c58e49 am: 2ac95673 am: a78c4374 am: fd911d5e -s ours

am skip reason: Change-Id Ie0e7d4f73efcf1942aadf8b9d67e4de914307c09 with SHA-1 48586110 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9e64df85fb288ed1ac214982d0127ddccc655190