Merge "Merge "Camera: Avoid enabling unsupported CAF modes during image capture" into rvc-dev am: 1a463d7444 am: e32bf6cd28 am: af61762b41" into rvc-qpr-dev-plus-aosp