Merge android-msm-pixel-4.9-rvc-qpr3 into android-msm-pixel-4.9

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