Camera: Remove R&C session parameter name shadowing am: 40b71eec

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/22533437



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