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

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

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

Change-Id: I360ed075e2138f6f22735cd97f1fcbb5b4634f27