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

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

Change-Id: Ief54f3c4e19f7a104d21cb06ce15b8ec73d4d84c