Merge "defconfig: Enable AOP clocks for SDM845" into msm-4.9