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

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

Change-Id: I8e8d7c9a553c1c6ea202567ad320c996e359adf9