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

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