Merge "SnapdragonCamera: Fix QUALITY_4KDCI variable name for M upgrade"