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