Merge "libbinder: RPC avoid FdTrigger shutdown race" am: 13ba6f3c3f am: f2e316ac20

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

Change-Id: Ic6c49b7c7e5378da559dba4375ea7418973a8694