Merge android-msm-pixel-4.9-sc-qpr1 into android-msm-pixel-4.9-sc-v2

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