Merge "Fix 2336057: Provide a way for the user to return to a call from LockScreen."