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

Bug: 184813985
Change-Id: I79f68acbcf1619834dec5754d718ab94cbadc54e