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

Merge "[automerger skipped] Merge "Merge stage-aosp-sc-ts-dev before making it an upstream" into sc-dev am: 6dd2ccb0 -s ours am: 234e0c76 -s ours" into sc-qpr1-dev-plus-aosp am: ae485d4a -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: I23395ab07d53815644f30e5ce0ba57ea12e63379