[automerger skipped] Merge changes I34b9ab63,Ic91d309e into mainline-prod am:...

[automerger skipped] Merge changes I34b9ab63,Ic91d309e into mainline-prod am: 829f4402 -s ours am: e73104a3 -s ours

am skip reason: Change-Id I34b9ab63d3aef867a1a2a59b10befc995f1e34b0 with SHA-1 cb528e2e is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2ae1d1e77f7b43e8e8ab064e211947e541b676a7