Merge android-msm-pixel-4.19-rvc-qpr2 into android-msm-pixel-4.19

Signed-off-by: Petri Gynther <pgynther@google.com>
Change-Id: Ie65885f3a0b95b0cd18d32190a7e1731e59544e3