Merge changes Id11c50c9,I0861f2a2 am: 79270cf202 Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/2186103 Change-Id: Ic2888c60210f7e97155fadd83df2b83242f44678 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>