[automerger skipped] Merge "Merge stage-aosp-sc-ts-dev before making it an...

[automerger skipped] Merge "Merge stage-aosp-sc-ts-dev before making it an upstream" into sc-dev am: 6dd2ccb0 -s ours am: f72b417e -s ours am: 9dade0ac -s ours am: 2e058af2 -s ours

am skip reason: Merged-In If0165fe89ba69659d9e451c0cf0cc28ca2c70616 with SHA-1 5450ceb5 is already in history

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

Change-Id: I477bb6c50b93e9c5479ecd82f0163c678a4d482c