Merge branch 'LA.UM.9.12.C10.11.00.00.840.201' via branch 'qcom-msm-4.19-7250' into android-msm-pixel-4.19 Bug: 210578498 Signed-off-by: JohnnLee <[email protected]> Change-Id: I33fd3a05def6d780604bc7dcff90006ca525061f