Snap for 7921329 from adfbdeedd0072d9a544d079faecc9f65de3d219d to sc-v2-release am: ae471a43f6

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

Change-Id: Ie40a5f514b436ed63805c2252eaff2bbf802d026