[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypicker-L95300000953180917:N88900001239066437" into sc-v2-dev-plus-aosp am: a9ea24d6 -s ours am: a96e8f99 -s ours am: 0f3f6318 -s ours

am skip reason: Merged-In If0ad2128a42ab5db0072de8f6448235fad3e18ee with SHA-1 d3439782 is already in history

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

Change-Id: Idabb01c44895d8c636ac63d62761d41e11f355cf