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

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