LAHAINA | LOS | AOSPA | Fixes - Merges from: https://git.codelinaro.org/clo/la/platform/hardware/qcom/display | hardware/qcom-caf/sm8350/display
LAHAINA | LOS | AOSPA | Fixes - Merges from: https://git.codelinaro.org/clo/la/platform/hardware/qcom/display | hardware/qcom-caf/sm8350/display