Merge android-msm-pixel-4.9-qt-qpr3 into android-msm-pixel-4.9 SBMerger: 284775313 Change-Id: I16ea4d301133808d9420fef27e57461df72e1377 Signed-off-by: SecurityBot <[email protected]>