Merge "configs: MSM8998: HAL compatibility for P upgrade"