[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypicker-L98300000953613236:N65100001246062163" into tm-dev am: 8fd140e8 -s ours am: 74d5df7a -s ours

am skip reason: Merged-In I35b7a0703333a9268dcea578328016604d7c1f54 with SHA-1 11d1d503 is already in history

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

Change-Id: I8fb4db0004f3bed7969ef5bdbd560eb4b7587a95