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