Merge "Camera: Correct request settings R&C override" into tm-dev am: e279de94 am: db7377d0

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



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