resolve merge conflicts of 198e15e0 to...

resolve merge conflicts of 198e15e0 to rvc-dev-plus-aosp am: 1d404df1 am: 86912f96 am: 74f594df

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

Change-Id: Id82d02ba44c445d4d15ddf642c2262093e6b609c