Merge "Revert QosCallbackException constant values" am: fc307eab4b am: 1b8ef2e422

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

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