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

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