Merge "Fix RpcSession::setupPreconnectedClient" am: 5a8cd452 am: b0b17c18...

Merge "Fix RpcSession::setupPreconnectedClient" am: 5a8cd452 am: b0b17c18 am: 8a973c82 am: 5c1aa416 am: 124aa65d

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



Change-Id: I202ae579b49ef0a06644702db21b378d46ceb00b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>