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

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

Change-Id: I8126df4818390ee39f4cb5ddd5bd910cf51f0c3e