Merge branch 'LA.UM.8.13.R1.08.00.00.571.015' via branch 'qcom-msm-4.19-7250' into android-msm-pixel-4.19

 Conflicts:
	Makefile

Bug: 140357864
Change-Id: Id147edaead961db636329bd74829fbf9b3270078
Signed-off-by: Alex Hong <rurumihong@google.com>