[automerger skipped] RESTRICT AUTOMERGE: Fix the error and make the argument nonnull am: 5dbd147f38 -s ours

am skip reason: subject contains skip directive

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

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