Merge "Swap parameters in QosCallback#registerQosCallback" am: 6ff3f3828a am: b0689bb8ca am: b2d584f506

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1629659

Change-Id: I730f38da35293aeaa751faf006532926da84b101