Merge changes from topic "QosCallbackException" am: 7a4fcf4ed1

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

Change-Id: I1c6475f08ae9117c063419f9ef8542b09d06c2fe