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

[automerger skipped] Merge "DO NOT MERGE: resolve merge conflicts of 458d1544 to tm-dev-plus-aosp" into tm-dev-plus-aosp am: 3bc8d92c am: 3ffa26ad am: 8ee20c26 -s ours

am skip reason: subject contains skip directive

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



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