Merge "Swap parameters in QosCallback#registerQosCallback" am: fce4049a1d am: f3f342370a

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

Change-Id: I2bf2b8a3eccf7dab7ac22efd9a444dbaa67faa79