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

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