Merge "Revert QosCallbackException constant values" am: fc307eab4b am: 41746935d4

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

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