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

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

Change-Id: Ic101ec25a26c3956d3bb29d2fcfb544f5cd7cdc8