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

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

Change-Id: I4791106b56d8776fe4c02609098cdd8bcebb3c12