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

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

Change-Id: I81e9cf23eb930aa6ca586dbb6556702b44c1a77e