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

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