Merge "binder_rpc_session: wait longer to shutdown"