Merge android-msm-pixel-4.19-sc-v2 into android-msm-pixel-4.19

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