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

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

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