Merge android-msm-pixel-4.9-qt-qpr1 into android-msm-pixel-4.9-qt-qpr2

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