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

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