Merge changes from topic "qp-handling" am: 8f6db1d7a6

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1651750

Change-Id: I0350fbf3189486faf766332523b090e5968b9f9e