Merge 'android-msm-barbet-4.19' into android-msm-pixel-4.19 Bug: 194667419 Signed-off-by: Lucas Wei <[email protected]> Change-Id: Ib41f7aab062a9b104fc1a398385bba01f5ffc948