[automerger skipped] DO NOT MERGE: resolve merge conflicts of...

[automerger skipped] DO NOT MERGE: resolve merge conflicts of 458d1544 to tm-dev-plus-aosp am: 2b7ab9d3 am: 4c77ca7b am: dd8ae119 -s ours

am skip reason: subject contains skip directive

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



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