Merge "Fix format warnings in hardware/qcom/display"