[automerger skipped] Merge "libbinder_ndk: fix failure when dump/shell are...

[automerger skipped] Merge "libbinder_ndk: fix failure when dump/shell are unset" into rvc-dev-plus-aosp am: 7f40d112 -s ours am: 4128a39c -s ours

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

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

Change-Id: Id8c300dd95357611105e7e6e8c145adc70d25849