Merge 'android-msm-barbet-4.19' into android-msm-pixel-4.19 Bug: 194667419 Signed-off-by: Lucas Wei <[email protected]> Change-Id: I27f1b36bfdcba4e471a018bb123a8a929be056c2