Merge "resolve merge conflicts of 76f6ed07 to...

Merge "resolve merge conflicts of 76f6ed07 to sc-dev" into sc-dev am: 1e5bd644 am: 8c3f4f65

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

Change-Id: I6360ec8b31677a98316753d7b1436e2b19932550