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

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