Merge "Migrate dialer to RoleManager"