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

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

Change-Id: If93206a1e4d890339a42812887df36fd6e6df003