Merge remote-tracking branch 'remotes/partner/android-msm-pixel-4.19' into android-msm-barbet-4.19

Change-Id: I60cb42efbc71eb1708f51248343ffda93a46bafc