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

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

Change-Id: I673f799cdb2a465c6d403cbf2d708ade3fce9db8