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

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

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