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

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