Merge "conf_files: sm6150: Update max resolution of heic encoder"