Merge 'android-msm-pixel-4.19' into android-msm-barbet-4.19 Bug: 187909050 Signed-off-by: Lucas Wei <lucaswei@google.com> Change-Id: I1fc0868a6d7aa8145b22e5ad7964b48d767bc068