Merge "Fixes AOSP EmergencyDialer failing to occlude Keyguard" into tm-qpr-dev