Merge "configs: MSM8953_64/8937_32go/8996: HAL compatibility for P upgrade"