[automerger skipped] Merge "Merge commit 'dfb3683b' into manual_merge_dfb3683bbef889fa72df975ebe45b0b1f65934ff" into rvc-qpr-dev-plus-aosp am: 761e1e1d -s ours

am skip reason: skipped by user essick

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

Change-Id: Ice672132552d8fb6685c51f8679413224a19960e