[automerger skipped] Merge "Merge sc-dev-plus-aosp-without-vendor@7634622"...

[automerger skipped] Merge "Merge sc-dev-plus-aosp-without-vendor@7634622" into stage-aosp-master am: 9b16469e -s ours am: 6ecf22fb -s ours am: 14d553c1 -s ours am: 41c0ceb0 -s ours

am skip reason: Merged-In I316cd3685bb799d6eb65dd2c0db84856d582f750 with SHA-1 59926f5f is already in history

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

Change-Id: Iffe8075b34e4419c7249977feec3d2538fed0b4a