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

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

Change-Id: Iaa2074a0e2e4ec4712d69d238af19de1d8b10adc