[automerger skipped] Merge "Revert "RESTRICT AUTOMERGE: Fix the error and make...

[automerger skipped] Merge "Revert "RESTRICT AUTOMERGE: Fix the error and make the argument nonnull"" into tm-qpr-dev-plus-aosp am: a9a863b8 -s ours

am skip reason: subject contains skip directive

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



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