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: I33b5f82bff3a4916b48e0ecd95d1d007727e8400