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

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