Merge "Add Qos Callback support" am: 8e39c04b56 am: d52695827d

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1d07d8e5bd5e0a40df7d7fa276bf0c1fed500ed1