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

SBMerger: 410055097
Change-Id: I8c01feee3111e9455e907c88d472ca921f304429
Signed-off-by: SecurityBot <[email protected]>