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

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