[automerger skipped] DO NOT MERGE - Mark RQ3A.210410.001 as merged am: 46f516593c -s ours

am skip reason: Merged-In Ib1c4df7a2870a28c8158d1ed8417807a353d24d4 with SHA-1 a541a072bc is already in history

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

Change-Id: I7d1af918ffd9f214b1334b3311fee0bbd37cf9c5