Merge branch 'LA.UM.9.12.C10.11.00.00.840.535' via branch 'qcom-msm-4.19-7250' into android-msm-pixel-4.19 Change-Id: I34f00bfb16d6c5e9fb82438d73223b211a02d10e