Merge "Make use of user id in getDefaultDialerApplication"