Merge "Merge android-4.19-q.75 (cfe571e) into msm-4.19"