Merge android-msm-pixel-4.19-sc-qpr1 into android-msm-pixel-4.19-sc-v2

SBMerger: 410055097
Change-Id: Ic93d1889ace993d5992a6a73e0990283614474ff
Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>