Merge "Merge android-4.19.20 (c28f73f) into msm-4.19"