Merge changes from topic "QosCallbackException" am: 7a4fcf4ed1 am: 7b83d68aae

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

Change-Id: I4924e84fa8c5aa2b41638fefdad2c2f686e838ef