Merge changes from topic "QosCallbackException" am: 7a4fcf4ed1 am: 78cc5d58e5 am: dcdf055539

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

Change-Id: I0add141f7138fe0266f95c285b601daaba3bf4a7