Merge branch android-msm-pixel-4.19 into android-msm-barbet-4.19

Bug: 184813985
Change-Id: I36d914a7d645766899f2cbeb3de1ce209d9b51fc