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

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