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

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

Change-Id: Ibe9ee6ae134ac332eab32da0c5d9767b96ba59b0