[automerger skipped] DO NOT MERGE ANYWHERE: Partial Revert of ag/27467076 for Pixel am: d2d7a13539 -s ours

am skip reason: contains skip directive

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

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