Merge "Fix QOS API review comments" am: 301abd2ef8 am: d1f7602682

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

Change-Id: Ic93ff2fb2d66deb690f5855ff78a3c34a9714d5f