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

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