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

From build 6575781

Bug: 158714637
Signed-off-by: Roger Liao <rogerliao@google.com>
Change-Id: I1cae476107cd8135c66e6001d81690998217dae5