Merge "Swap parameters in QosCallback#registerQosCallback" am: bc71009366

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628901

Change-Id: I2c371b6f1dc25f84a389480e46d9d582e9da148b