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

Bug: 187909050
Signed-off-by: Lucas Wei <lucaswei@google.com>
Change-Id: I5355253bce3b7c945ea75f94f24d22ec601dacf5