Merge LA.UM.9.12.R2.10.00.00.685.039 via branch 'qcom-msm-4.19-7250' into android-msm-pixel-4.19

 Conflicts:
	msm/vidc/msm_vidc_common.c

Bug: 172988823
Signed-off-by: Lucas Wei <lucaswei@google.com>
Change-Id: Ia851acbba50ef633cb45130bccd5be788e8e4cf7
tree: 15ce0759f7bf442d2fe14db03493e08f394c69f2
  1. Makefile
  2. config/
  3. msm/