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

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