Merge "Camera2: Remove manual changes from CameraCharacteristics" into main