Merge "binder_rpc_session: wait longer to shutdown" am: 5d4da609ef

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

Change-Id: Id183e213c89998150fade69e52e52acb414efdc8