Merge android-msm-pixel-4.9-rvc-qpr3 into android-msm-pixel-4.9 Change-Id: Ibd21635ae8d6377d263290d795b4716ebc5a3971 Signed-off-by: Lucas Wei <[email protected]>