[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE am: 5714e607c4 -s ours

am skip reason: Change-Id Ic5e9d14519f1942a42613b83084c053cb8ca05db with SHA-1 a364a910cf is in history

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

Change-Id: I1f0305c9dc6914832f147f12b6ed6ea2cd526209