Merge "Revert QosCallbackException constant values" am: fc307eab4b am: 1b8ef2e422 am: 762fb74366 am: e05873b62b

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

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