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