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

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

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