resolve merge conflicts of 9433ff3a to tm-qpr-dev-plus-aosp am: 07802f43

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



Change-Id: I037dcac35f02577af0b51f3fda4f17667dd1d6d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>