[automerger skipped] libbinder_ndk: fix failure when dump/shell are unset am: 8d49c3fbae am: 59ffb3c974 -s ours am: c2e1fb6a74 -s ours am: 991b429f3f -s ours am: 7fe9404cd0 -s ours am: a3a26f904b -s ours

am skip reason: Change-Id I1f6909531bc640097f3f48c4a558fd03f2fa62cb with SHA-1 8d49c3fbae is in history

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

Change-Id: I197c8951299b09117e198248c675d39161d73a03