Merge "SnapdragonCamera: Fix HFR string mismatch"