Merge "libbinder: RpcSession - avoid recursive include" am: 8e33ba576e am: d6a6e178c5

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

Change-Id: Iaeed4d3ad8c67c4450fc6fe8e1ac3ba9ad92205d