Merge "Support QosCallback with UDP socket" am: 2304205a58

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

Change-Id: I3e5df1bd44defbb9dd0c382c625a21e176368f2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>