Merge android-msm-pixel-4.14-sc-qpr1 into android-msm-pixel-4.14

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