Merge android-msm-barbet-4.19-sc-v2 into android-msm-barbet-4.19-sc-qpr3 SBMerger: 410055097 Change-Id: I6240ba278aced80054caaf0cea6864ecef4687e2 Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>