[automerger skipped] Merge "CSD: rename get/setOutputRs2 to include upper bound" am: 429e51f4e7 am: 689c34e8cb am: 29c425bc95 -s ours

am skip reason: Merged-In If4e065deeedb32c3e5e81caf4cd6924fb5815dc0 with SHA-1 34f4c1d5d7 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2494661

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