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

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