Merge "Add RpcServer::setRootObjectWeak(wp)" am: 5b7b63796e am: c72a1b64dc

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

Change-Id: Ia17b099ade984ec7d86b2ac254a91e0fecb2c35f