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

Merge "[automerger skipped] libbinder_ndk: fix failure when dump/shell are unset am: deb53467 am: 6674db2d am: f5227544 -s ours" into rvc-qpr-dev-plus-aosp am: 8110afd5 -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/+/12371718

Change-Id: Ice03dc46f1a4284a01d230c78c50b67dac4e60ec