Merge "Swap parameters in QosCallback#registerQosCallback" am: dcc2fb2a19 am: 507df2663e am: 2e744846a0

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

Change-Id: Ice84bb2e6d855ed88e7e432cf49739e69c9e01de
tree: ee82e9ca4d2576b2de1df823d1a5da259e8fb418
  1. framework/
  2. service/
  3. OWNERS