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

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