Merge Android 12L am: ce84c3878f Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/2013398 Change-Id: Idee520b521dc829f9829a45d22591126763c3585