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

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