Merge "Changes to UNEXPECTED_NULL handling in libbinder_rs." am: 0063364870 am: d27e8676be

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

Change-Id: Ie553808a08df17439d44bba29ea3d272e2e17fa9