Merge "Add missing camera characteristics to fix ExtendedCameraCharacteristicsTest." into main