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

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

am skip reason: subject contains skip directive

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



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