Merge "RpcSession change CVD to CID" into main am: e2740b7f33

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

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