Merge branch 'LA.UM.9.12.R1.11.00.00.597.108' via branch 'qcom-msm-4.19-7250' into android-msm-pixel-4.19 Conflicts: qcom/Makefile Bug: 182748782 Change-Id: Ic08f6b1bf5dbd47625c27b18f3afaa5b59fc4638 Signed-off-by: JohnnLee <johnnlee@google.com>