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

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

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