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

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

Change-Id: Ie465891bb608fca9115cba7b528386fbcfbdc962