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

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



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