[automerger skipped] Merge "Merge changes I54a7af62,I98364ee9,I394e3e65 am:...

[automerger skipped] Merge "Merge changes I54a7af62,I98364ee9,I394e3e65 am: bb155b3a" into sc-dev am: 2a6557f4 am: 5396a24f -s ours

am skip reason: Merged-In I4fb2ac5b917d5ef4cfd411559ae74d2c99f267fd with SHA-1 30a42ebc is already in history

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

Change-Id: I8e11f56f385f6aa10b1684377ab1ea2e9fe2d3c1