Merge branch android-msm-pixel-4.19 into android-msm-barbet-4.19 Conflicts: qcom/Makefile Bug: 184813985 Change-Id: Id8a7d6d22065a30c37d656bb6eddb12dbb38aa9c