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

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