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

SBMerger: 410055097
Change-Id: I939fe072b75d292f462516268f5c2b59c595ff48
Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
Signed-off-by: Lucas Wei <lucaswei@google.com>