Merge branch 'LA.UM.9.1.C11.11.00.00.841.013' via branch 'qcom-msm-4.14' into android-msm-pixel-4.14 Bug: 189072771 Signed-off-by: JohnnLee <[email protected]> Change-Id: Ib31408da89e8abe757189840164536b6246b2bbd