resolve merge conflicts of 3d7f7608 to...

resolve merge conflicts of 3d7f7608 to rvc-qpr-dev-plus-aosp am: 28343349

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

Change-Id: I5a325b3ace463f1c0afc565f92a090424a6be9e4